Revert 8a5c30d..71d0405

This rolls back to commit 8a5c30d315f019e7e377ecd3fa18ba6d702d1cff.