If you are more comfortable, we could leave it "double-wrapping" the content. Wouldn't hurt for master branch then.