A proper hack to be removed soon ummmmmmok? Refs #4357