reverting #6243, fixes #7458