Revert 1f87845..54c17a5

This rolls back to commit 1f87845877ab82ad16b21c3d091a08f70d9676c8.