removed workaround for old compiler version