restore performance improvements

@czue @twymer @dannyroberts