Reverted some changes that were not helping much.