Breaks compatibility with the D6 version, it needs to be changed back.