Revert 1eff055..d6fe023

This rolls back to commit 1eff0553dbd7fe6d71d93135577ad36174afcc62.