reverting 675be146856ac65031b50684912223c151ca902fdue to potential minor BC breeakage, need to investigate further, refs #812