Add initial (ineffecient) support for flag to turn off attribute pushing