abc: revert unintended hunk of commit afb473c