Revert "Don't fail on detach"

This reverts commit 545ed6abb6b3d257a72693d71aaeb4af1d67854e.