Revert cfd4bdf..81b17ec

This rolls back to commit cfd4bdf93c528ee0c459ddda6ee0a75ac33cd105.