Revert "Merge branch 'feature/b6-no-generics' into develop"

This reverts commit bd32b0d23627d086f69f4e1d9ca12d87c2655099, reversing
changes made to 5806dddebfece9c61e17101cd07ef216fc6a8169.