bionic: revert for now