We don't appear to need it anymore, and it results in inconsistent
behaviour.