Fixed regression introduced by performance patches

Change-Id: Ie9b3952c69928ce32fff4203a6a9f68233ca8fb6