Reverted #362, the issue no longer occurs. Fixes #706.