Revert b65eba2..0c3a270

This rolls back to commit b65eba200a462540ad4dc036d2fec4ef42262b56.