@dantleech reading the above removed code, it seems we already did the same before. not sure why but i would not change that behaviour in this refactoring. it should not break any BC.