This reverts commit e8349e3b.
The close action doesn't actually work, so let's remove it pending further investigation.
Fixes #2264