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

This reverts commit 24ca635399fc6caa50a519a1aad072596012d97a, reversing
changes made to f3cfd7d889ccab1c6646f237884f47f388fa3b37.