this optimization was probably lost during ST refactoring. Change-Id: I845978c4b718cb91941d15b30484837f19714abe