Revert "Merge commit '6b6f8bce5950a8756e121f8b12e024b41ce9e2ed'"

This reverts commit d821e8e71d23e2f3156d0103c65ab16cfe486d6f, reversing
changes made to 9aca85b137bb14c3b8afbfbaed37a80ae7b70825.