Slight improvement in performance.
derflr: +1.828%

Change-Id: I74f5d3743a2b9c27e8b97c266c702dd1a791f73e