Roll back a portion of commit 91673f0ff3e448ca20d80a57d12321b4a08faaba
@AbrarSyed , take note!