The 

```
// TODO: remove once https://github.com/oaeproject/Hilary/issues/519 is merged
```

line needs to be removed