0.3 update
Revert "0.3 update"

This reverts commit 8cb3628d928efd2992b1f95c088dd208e0146d0f.
0.3 update