Replacement for Button.setCaptionAsHtml(true)?

In Vaadin 7.6, underscores in button text could be displayed using:

	Button button = new Button("C<u>a</u>ncel");
	button.setCaptionAsHtml(true);

The setCaptionAsHtml() method is not available in Flow. Is there a replacement?

This works but feels hackish:

	Button button = new Button();
	button.getElement().setProperty("innerHTML", "C<u>a</u>ncel");

This works but feels hackish:

If it works, it is an option, another alternative is this one

Button btn = new Button();
btn.setIcon(new Html("<span>C<u>a</u>ncel</span>"));