try that ErrorBox removal again

Change-Id: I1d2f24def771651d36f06432c20e80429379c9fe