Revert "Merge remote branch 'origin/master' into source"

This reverts commit 1a59c4685a056d9259b026743ac10057f2edcc57, reversing
changes made to 02a1e8c04448e19741c221f345c579b464aabed2.