Rip out some inbox-util setup code which I missed.