Need to reinstate these - see comment about backwards compatibility below.