Revert usage of Scala 2.11 reflection API

- Would be nice if local unit tests were run against both 2.10 and 2.11