Revert "auto generated code to select proper things"

This reverts commit dc84e5108891207f09f53af2ff3b912253d21682.