backing out 61e705a28eaf71c22d08421eea7066db4647c63f, incomplete, refs #984