Even further optimization

This one needs tested both during build, and at
runtime before its merged.

Change-Id: Ic2c0eb3c812e9c54f9fabc5340d1282a9aa901b5