I missed a check in the previous patch, adding it in here.
Created attachment 186888 [details] Patch
pushed manually, trunk@142019