Revert "Merge commit '1ccb8c51113078c81b1d8433794bae4c369de607'"

This reverts commit 7da22a21d768d62585cde54be9b32fc861951ef2, reversing
changes made to 6963a5da76186a001a81409cbbeee0fb1666bb38.