Revert "[TIMOB-10837] use return with the last statement for blocks"