Restore old behavior.