Getting rid of the previous ugly hack.