Rollback runtime dependency causing build issues