Reverts faulty git merge

Summary: I have reintroduced removed code by landing R5:3170bc15592efd3b14a6e774f32da6b658ef27b7. The code in question was removed by R5:b1dde4993c81b07f6cbfe30dbaab3bd886c20075. I fix this git merge regression.

Test Plan: Just see how I can't do a proper merge and accept my fix.

Reviewers: mturdus

Reviewed By: mturdus

Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D25960