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

This reverts commit 201f2a4cc14fea28b1723b56b07a7c7f9aef765c.