Revert 8794717..e4a7df3

This rolls back to commit 87947178e9d826cbdc26c198c68ee28f68384ed4.