IMO it would be worth dropping completely everywhere to reduce the amount of ifdef checks. There will be half of them if this gets removed and this mis-feature isn't worth cluttering the code.
I don't know if half of them is correct, but I agree. We should just drop this, it's not like #85 gave a real motivation for it.