commit/patcher: didierverna: Backed out changeset 1feeb6a07fa7