Revert c75a63c..efbb73c

This rolls back to commit c75a63c8443387a9e2fd1c34142714e045362544.