Regression in 0.7.4.rc1

For the 0.7.4 release: Fixes the regression from github issue #2452.