Revert 8d458df..1647078

This rolls back to commit 8d458df9b11e996f6234573833f1a14c0311656e.