Makes more sense this way

Change-Id: I7d602e6cca02330ccf419bd04d9bb0f3033e5640