Revert 07bcf78..0ed4293

This rolls back to commit 07bcf78eb7830a6c3f468a92dbedeeef278734e7.