Revert "Merge master"

This reverts commit bb044681660fddf525daaf794a9ae5a133b1618a, reversing
changes made to a478a0cf9b05d79dd7cc44feb5e79c86852992a2.