This way it affects code ~only internally in tubes/ module.

Change-Id: I1fd1fa460d51ad57ae2f6df0adeb5fadfc7a8c95