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

This reverts commit de7358fac6204b6d6f44647d02605630ec322800, reversing
changes made to 91a40b9a96a2ed53b55f5d29a0c241eaa170cb41.