Refs #6877. Taking it back out for now.