Revert 997ce0f..e1f5e18

This rolls back to commit 997ce0f7886e15e3669b0f8ade4a84c66a00744a.