master: reverted changes to v0.1.2