In theory, this isn't necessary on 0.9.0 either.