A note explaining why this has to be added manually with a reference to the place where the fields are no longer required would be helpful.