restore performance improvements

@czue @twymer @dannyroberts 
its only used inside the `else`