Merge "Remove the "needs_erase" workaround."