Revert r111023 and r111024, they broke user.options . I'll fix this properly by split...