The fight on the stairs

Did anyone else think it was going to be a "Shatner's stunt double" moment like in old episodes of Star Trek? Where they'd fight all the way down the stairs and then at the bottom, in the close-up, it'd be Shatner and not the guy with the big curly mop of hair?