Seems I screwed up during refactoring. 641779ccf121c0e21219817d78ace25c0d0ab3b4 is a known working commit.