Revert code as it was indeed correct