Revert c3bfed5..18ed118

This rolls back to commit c3bfed5334b6960f5b992c68616b2b9757347cc1.