This reverts commit 9675347f.

Reason for revert: Masakari CI is working

Change-Id: Ifb44a437b96c0c029210b1491ee6c6403ee9e6fb