Yeah this change was made after removing the getNonIndexed... method. Has Jesse's blessing.