Removing dirty hack.