Revert "reorder things"

This reverts commit a945e8c704b13e759b0109760576a46dd7d4c43e.