Removed workaround which has been fixed