Make it even dumber.  To Support 0.9.0