Changed in 9b87a387ac45