What does this implement/fix? Explain your changes.

Overload resolution is hard. Until we have proper one, hacks (especially ones, that cause confusing behavior) will be removed.

Does this close any currently open issues?

fixes #1523

Checklist

Check all those that are applicable and complete.

• Make sure to include one or more tests for your change
• Updated the CHANGELOG