Merge "Remove pointless hidden overload for accept()"