This reverts commit 4b5ed863. This commit causes an infinite loop and a crash in the Ubuntu installer. LP: #1870508