Revert some things to older code - no fixes

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>