Fix the hack: we are in the transaction already! (OMS-401)