Revert "Merge branch 'fixes'"

This reverts commit eeb2398e4dbcbd1c1bcda5a3e3ccc53b8be5915e, reversing
changes made to d693263815f4409b44d9a38c63884059fb739d3e.