Partial reversion to previous version to preserve tie-ins