Revert "blya"

This reverts commit 276754ccc821670b7fd7a43f40effbb5e3e07180, reversing
changes made to e3716a1a03335f2a394c612c9181395c58cd5738.