Revert "Merge branch 'master' into bleeding_branch"

This reverts commit a1f2793be6b926a69854156080f9ef2b6aea9776, reversing
changes made to 8c3b7292d9080d51ff1a391f643ca7840b3e30af.