Revert c3f4b13..07421de

This rolls back to commit c3f4b13fb7c20a4a23b5357ec0ea08ac81502e53.