reverting tlv refactoring which caused errors I dont have time to fix right now