ok sure - can you put a comment in there explaining this? I wonder if we should do that already in master and only keep the bw compat in 1.x?