Revert e1ced2e..639715f

This rolls back to commit e1ced2e041456bf23d1d6276713bf30596aaf2b5.
22

22