Revert "Merge commit 'ebae75ba3fe2aec54b241b33a912c48614fc1f2c'"

This reverts commit 8a50df042ac791cebf6edbb68a7dc3dea8be3896, reversing
changes made to ebae75ba3fe2aec54b241b33a912c48614fc1f2c.