Revert "Remove the workaround for the #663 Heisenbug again"