Revert "Sev's change"

This reverts commit d373481312cc002700ed27f07dda2f55bde3c4b0.