This patch requires Ubuntu16.04 to properly pass
the tests.