@mrvisser : Do we want this to be removed?