Revert "Last Before End"

This reverts commit ad94e4f7b0bc55f3c62f196ed96b21bdcf539d12.