Revert "Merge branch 'master' into Me"

This reverts commit 8002e29816938b35d3d74785ba8fe678169faa11, reversing
changes made to dccb28a0a53a2b9ee03d8769575e80eae3132e3f.