This was simply missing and meant we weren't testing it properly. (cherry picked from commit 2a109902)