Revert "Merged with master"

This reverts commit 5d69914c955bb55a51bb17f0eea4e54b77718f76, reversing
changes made to be3a5ce7123fa99f817fc13397c2d823bc993de9.