Revert "Merge remote-tracking branch 'upstream/master' into newunittests"

This reverts commit 1e32868d458410c8579b21aee8c2dd445954ee2d, reversing
changes made to 00ed67c5b28a6d9f3337d5f26ffd8224b6e09139.