Revert some changes, actually not possible to simplify this block