Revert 9c52664..93b5260

This rolls back to commit 9c5266463897506a0a999e47616c2d26b84c76ab.