Remove Tobi's 'new idea'
Fix build