Before I pushed the "move code to a different file" commit, I rebased, but forgot to test the build. Sorry.