Back out r166591, not sure why this made it through since I cancelled the command...