Revert "Fixes provided by Raghu"

This reverts commit b43130f89493760a82ae107bc7d4cbbab0a8c2f1.