Revert "merged with master"

This reverts commit 390cedfaf21ed9e647648573f0405654550c3731, reversing
changes made to c94d6a2b8d5633dc0b4418498af7c8454da57521.

This merge was a mistake!