Revert "Merge branch 'master' into get-binroot-fix"

This reverts commit 0a0625ab530a557c31fcc0220881fd76bd86a0c7, reversing
changes made to d4806255e8d73567a64db0c3a8ad9196a13d226f.