Switch to vanilla

ANDREW JDPHKA