Revert 0703975..52142b0

This rolls back to commit 0703975134985bb4f1b6f2532d57b3cd3b9214a0.