Revert "Fixed incorrect treatment of 'last'"

This reverts commit a989d5904da1c2317ddc94cd77533b21a6db26bb.