Should we keep this for backwards compatibility? It is so short lived...