restore old behavior