There was a problem in previous patch formatting, the diff was headerless. Reattaching it.

Regards,
Egor Ivkov