Fixed borked 2531d9f0a39750af6772903dfe08e3b05c449f84, refs #1025