Removed workaround for fixed (#490326)