yotam: Fix to version control plain_views