restore performance improvements

@czue @twymer @dannyroberts 
:+1: