Rollback to non-proxyized version