Revert "Merge commit '2de036edc23203d2e2920687e5c16e13bae2ea83'"

This reverts commit fbfd73ae91ebe13d2b8ce9bf939a0cf749eface0, reversing
changes made to 9936106346ff8d7db5fb5c0f1f6337cd7df7f490.