prior to reverting to v1