rollback the commutative transaction stuff from 2.48.2