Restore 0.2.3 code