Can we keep it as it was and get it merged with the existing approach, so it can be included in the release without a visual regression? We can then fix it in the Boostrap branch.