Changed in fc35baa7f7c4834070f3481099016967b0d02e38