Fix for SUPEE6788 performance bottleneck - View it on GitHub