fix borked 379de51f1ae0c9203de0f72ecbd2e6a37820838b, refs #1029
merge a058229292eeb7b23976cad6d7927210be896f0a, refs #1029