Reverted the merged changes