Revert "Merge remote-tracking branch 'origin/testBranch'"

This reverts commit 683307ca12be77a105b96a2a1f48688388d76fba, reversing
changes made to b930c934b79b534ff6b71c8e95c860f231276a2a.

Revert of old merge