Revert "Merge remote-tracking branch 'origin/source'"

This reverts commit e4c9afb945e6cb2ff5ad70bb12e753ce79877cae, reversing
changes made to f06afbdeb33cd3f4fc52420fff916f95c8471901.