Revert 1183e9a..eccdf80

This rolls back to commit 1183e9a85b2f05b1628a5a6c3adf38111d80dcb0.