[ar7] revert part of r16112, the setup.c part needs more testing