Move some code

Everyone loves juggling!

Change-Id: I49c34ef5d23a771a227a8f71358819d18e16aaa8