backing out ce308837f749f023e17415fbcd6b6bfca436ebb5, it's broken, it's broken! refs #911