I think this actually do something subtly different than the original method – the original implementation (before the bug was introduced) calls `content_tag` with the options hash as its first argument when there's a block, now it calls it with 'Button' as the first argument. Although this is ignored downstream in `content_tag`, it might be best to avoid depending on that and keep the existing behaviour. Afterall this kind of subtle changes is how we ended up with this bug in the first place :) Thoughts?