cf692140a9
This reverts commitde693b8206. (+1 squashed commit) Squashed commits: [cc80cb8] Revert "Simplify handle" This reverts commit83b8fa14c6.