Removed history enabled checks as it is required by core