I'm only moving this code. Let's clean it up in a separate change.