Revert the change as it's not really clean