Revert c861f01..74bda8b

This rolls back to commit c861f017c8203ada73bd40cf09c146f76f72fa60.