urest: kill dirty hack, at last