Revert 1d7434c..41aa7cc

This rolls back to commit 1d7434cc5ec699573a0590247a40a114072e6f1d.