Back to the old behavior.