Revert "Merge commit 'd464fad2965565760376d479a8c54cf485e0630c'"

This reverts commit bc9205b43874990557e6fae90baa0b19a3d1c712, reversing
changes made to f5d65a9457d24113358d05a9720ae4e82d867294.