Attempt to fix ongoing linux bustage after porting of bug 938510. rs=bustage-fix