Back out 854623def9c6:a976c1645d70 (bug 917583) for Linux/Windows bc bustage
CLOSED TREE