Merge "Remove redundant module check when enabling rollback"