You know, belts and suspenders...

You're right, this was just the way it was in the old code before we added the rearranging thing to make it work on ES.