This reverts commit 4943285a, reversing changes made to bca0bccc. This should repair the broken master branch.