Reverted the fix to add to dev branch