Move vcprompt back to core