Reverted change, new API does not like this.