Revert "Merge remote-tracking branch 'extcode/master'"

This reverts commit 2fc12029dd9852e2fcebd1575f8b8bbe96a03aee, reversing
changes made to 44fd70e2ca66b347432a6aacf0a527462a93fbc1.