Revert current implementation of transactions => dead end