Revert back, this is the correct behaviour.