Switch ordering

See https://www.pivotaltracker.com/story/show/62547638