backing out broken fix committed in b1750e1f59afbb14daec3c5fec33d48cd345b350, refs #843 and closes #910