Revert "Merge branch 'source'"

This reverts commit c3558c3e4d3389b83941c1887a0bb2a40f33f5be, reversing
changes made to f17e80c4694634b7f3ab1ed52b72cbd4fad588eb.