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

This reverts commit 3cb7a8c81b7a1074ba311e5e8ab1513250057641, reversing
changes made to 33187d14e80e705e4fa3bb275284ce9a10b9641a.