as we discussed, it should not be a part of optimization, please file a follow up bug to move it