legacy support is broken, reverting