This caused the build to fail, due to some type checking errors. Whoops. This reverts commit 5c115236.