Re-opening #2474