The change to remote behavior was not fully compensated for in previous commit. Go farther and ensure that the classic syntax is executed exactly is it was.