This reverts commit fbe51d68a7. Changing the commit message to correctly reflect what we're actually fixing.
fbe51d68a7
460665895c