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

This reverts commit 9bfbc8a97c3cf068003c23319030588b61b25187, reversing
changes made to 48ed38a645cce4dbfeed804650736b372c107aad.