[master] Use safe reattach