Refs #336. Added back in code that shouldn't have been removed.