Fixes #1103: Bring back the original 1.0.x behavior. This is a regression from #859