Revert 9e70bdc..b607a1f

This rolls back to commit 9e70bdc2d181dc3cdabf65ec40b55f442b1551e2.
Git stuffs...