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

This reverts commit 629b5e7f20908f38919ad43520cd517ba9a99a37, reversing
changes made to a674081759a045eb8c26e4228be525a5b9977943.

rrozewsk/OurProject