Undo bad change on Ram's branch
This reverts commit 36db04321992a2b1d7a4aaf013097c7cf7a0f3f2.