Revert "Update to Ubuntu"

This reverts commit 00b9cfc7d64db3a852073931d80da59e5bdf6b7f.