Revert 912ce78..72e24ff

This rolls back to commit 912ce78c878462174490c0fb88499fb4f382aea7.