Refs #6092, last related commit probably won't fix the issue, this should do it.