Task #8161: supplement to r32101: also change default for future hardware to current hardware (best guess)
