[dot] We need to clean this up before it can be made 'safe', I think.