Revert f041143..652fde9

This rolls back to commit f04114351edadde0f3de1ea10bc0e409fef3915b.