Revert "Merge branch 'source'"

This reverts commit 11e79cfc0aefe57f767032a5f819d45d1dbb9e35, reversing
changes made to 9224335eef6193bd76ac9f09ffc5aca1af88f56b.