Apply the same fix in SHA: 61457e1c1b to safe_meta_def
Revert "Apply the same fix in SHA: 61457e1c1b to safe_meta_def"

This reverts commit c054728227675803017555488b4a2e7009359d09.
Apply the same fix in SHA: 61457e1c1b to safe_meta_def