Revert a657b3a..0053e78

This rolls back to commit a657b3a42a8269c96e86ca6fb18a31e521e98714.