Add a @todo with a comment from Kostya so we don't forget to optimize that at