Revert 10e1e12..ef00135

This rolls back to commit 10e1e12a96b694eda5a00846f1c05f1cafd0f3b9.