Improved work-around for simulator build-break.