Revert af92ebb..f4b0623

This rolls back to commit af92ebbb1b4f49df9aedfe9cf24fb4d629716f9e.