Added TODO to remove quick performance hack.