Reverting to 0.3.4 as baseline for 1.0