I wonder if we want to restore the original specification here, has the behaviour changed in any way?