This reverts r365950 since the latest bmake update includes fixes for the test failures that prompted the change.