Restore icanboogie/inflector to dev-master