Temporary fix until Bren's full changes are ready to be merged.