Is this debug-ony-code or do you want to keep this in the master?