Revert "Merge branch 'wip'"

This reverts commit 5c47a94dc04b2895d6921e8112e394994a8dc97d, reversing
changes made to 8ab613b41e0b6161cf61c89765628cddf4a96777.