Revert "Merge commit '92e0b76024459887832e0cd1612fa1335c5773be'"

This reverts commit 9d791f7b84e2ae7fcaebd300b9ce3265a27a7882, reversing
changes made to 832dabb0a61d1809aeca3ce6ae81b70e26a561b5.

~mfrost