refs #3167 - 15: messy messy last minute change