Revert "kshitij-2015"

This reverts commit be51b7dde4adcb8406c0bb7ffcd5199c53dc0613.