Navbar container media query in overrides.less not using @grid-gutter-width variable from variables.less

I am using the latest version of Bootstrap (3.0.3) and have the ability to change the number of columns from the default 12 to 16. In our sub-theme's variables.less file, I've changed the @grid-columns variable to '16' and changed the @grid-gutter-width from '30px' to '20px'.

When we did this, the navbar container was not lining up with edges of our main-container.

In overrides.less, the navbar container media queries hardcode the default @grid-gutter-width of 30px instead of using the variable.

// Default navbar.
.navbar.container {
  @media @tablet {
    max-width: ((@container-sm - 30px));
  }
  @media @normal {
    max-width: ((@container-md - 30px));
  }
  @media @wide {
    max-width: ((@container-lg - 30px));
  }

Instead of 30px, this should be @grid-gutter-width.