Revert "Fix broken build"
Revert "Fix broken build"

This reverts commit 74dc4ef0f9de8a79a521de1ddff80ec0f81bc32b which was
pushed accidentally.

tmgstevens/flume,tmgstevens/flume,tmgstevens/flume,tmgstevens/flume