Revert "Fixed Ritwik's Dumb merges."

This reverts commit c0732d3bc97526e468b5dcc118b92fcdb5c10521.
Revert "Fixed Ritwik's Dumb merges."

This reverts commit ed48a9b3b1f021d39d791d1bcd65566adfbc15f7.