Revert redesign in the trunk.