Reset to v0.1.28 commit 86c4034d4