Prefer cached failure over unsupported system type

Created by  Eelco Dolstra  on June 16, 2015
FKLICOHYATLMF3Q6YBQAOVKBRTCDY2TLKHML3B4DUI7YX4H4MQCAC
Change contents