Revert "Pull changes from sviatoslav repo"

This reverts commit f0b27108354e0008209c2e1ef8a27e4539228168, reversing
changes made to 13280e9461d77b8fb01c57225cab3f7c30d03c48.