reverting a commit. also started working on 4.0.6a