I pulled a Jay and forgot to stage something. (cherry picked from commit 58ad8fa8c0bb67594402cc846849c7209ba67d71)