COMPATABLITIY: replace several builders with straight code to be compatible with java 8 build u94