Replace unveil with vanilla version (WIP)