BACKLOG-5216 Make it work again following refactorings that broke the functionality.