Hotfix for breaking changes in #229

Just rolled it back for now. Let's make a proper solution in 0.5.10.