Restore the overloading special case and add a test for it