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

This fixes #856