Reverting commit number 173028 as there are some