Restored commit eca7dfbc294132c31fffc932729851c26e4f9a00