Revert: Arq merge 3