Removed a hack that has been fixed upstream