Revert "Merge remote-tracking branch 'origin/orep'"

This reverts commit bae680d11a658c22965655ad757838d925c52390, reversing
changes made to 4f6f531f4087a58eea6844f57b11b3a9522d6862.