Simplify Vanilla hack #127