There's actually a tool called vomit [1] of all names to fix exactly what what is being discussed here.

[1] https://github.com/zachahn/vomit