Revert 64ac083..d57727f

This rolls back to commit 64ac08307134ba015e5888a2f7aea82ffa9272ec.