Issue #3113150 by navneet0693: Reverted remaining configuration by hook_update_N which was left in 8801.