revert fix
 these commits were not boot issue's reason