Revert: Fix broken tests
(cherry picked from commit f9b21d1)
reviewer: Sergey Evdokimov (6aabd8d)