Actually... with the responsive layout enabled, it's the way that I mentioned, with it disabled it's the way that's currently in the code.  

Odd, but it looks like we'll have to support both cases.  @kenkouot can you look into this please?