Revert "add some hackish branching to support preliminary bionic install testing"
This reverts commit 36a3957773533f1abc08f2438089ecd1a5f3cd24.