move helpers back to the correct spot

Change-Id: Ia8e696aae85aca581c808adc9b3a87b7262b1937