Seems like some changes were lost when I manually resolved the conflicts...

... related to branch 905-...

@kbromer / @jlantz ~ Something got messed up when fixing my local repo after the revert-of-the-revert. This should fix it.