Partially undo last fix
Release 0.8.11