Refs #6385 Reverting changes that do not work