Removed a hack that's no longer necessary