Reimplemented according to comment from author.
#rb sebastian.nordgren
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 6134169 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 6135815 by sebastian nordgren in Dev-VR branch]