A two-step roller finger follower having a high-lift follower portion that pivots on a pivot shaft disposed on a low-lift follower portion, and having a lost-motion spring disposed between the high-lift follower and the low-lift follower to bias the high-lift follower toward the high lift cam lobe. Various bearing cups and roller shaft sleeve embodiments are shown, all of which allow for improved shaft and needle bearing arrangements. A z-stop formed by the bearing cups and/or the shaft sleeve limits the range of travel of the high-lift follower with respect to the low-lift follower. Various z-stop embodiments are provided including a non-contacting roller shaft sleeve that grounds the high-lift follower to the low-lift follower independent of the roller shaft.