revert: ARM:7755/1 and 7772/1