Revert commit 158073 while waiting for a fix. The issue is that reassociate