Removed workaround for fixed (#490330)