Rollback to stable, remove hack