Getting rid of an ugly hack that wasn't necessary after all.