revert restructuring of default feature crea#tion
build