restore old behavior on ret val checks