Get rid of manifest-form altogether