Fixing Up the mess after revert