I'm not sure where along the line this change was brought in (there have been a couple of rebases and merges from master on this branch) - but I agree, it's not good to violate old mate Demeter.