Revert 961e50f..d2e3547

This rolls back to commit 961e50f090b22c9598cd3aab12af2d84f671b44f.