Issue 5656 change meaning of borrowed self

See #5656 for details.

r? @pcwalton