Revert b30b40a..ef60bc2

This rolls back to commit b30b40a34181c2e70a80b1b61365e8da23123835.