Regression in dev branch after fixing #1651.