This is a followup to I18e67bcb, that I failed to notice before merging Change-Id: Ia96f831f279b0f6a348f1db80ecf30298ecf064c