Revert of 0.3.0 merge