Rollback build changes to exts to make build work again