Removing hack, as it now breaks things.