Fix #856: Revert a064487 as it introduced a BC break
bug #926 Fix #856: Revert a064487 as it introduced a BC break (romainneutron)

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Fix #856: Revert a064487 as it introduced a BC break

This fixes #856

Commits
-------

e9571cc Fix #856: Revert a064487 as it introduced a BC break