Why are you removing the FieldsetPrepareAwareInterface implementation? or is this due to submitting from an out-of-date master branch?