Revert "Code change to fix small bugs"
2 files changed