This time really close gh-434.

Last commit was applied to the wrong branch.