Move this to the right place
(cherry picked from commit 19a51e4f274e85155cc50438614ce7a27094a0c5)