Revert 490cbbc..5d78452

This rolls back to commit 490cbbc1bc03dcb2c51a1ebf3f0f9bde5e7e4afc.