Revert commits accidentally (?) committed to master branch.

This reverts commits 2264a151 etc.
1 job for master in 2 minutes and 38 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #175036
test

00:02:38