This reverts commit e3b90b6ccc. This commit broke container tests and thus blocked channels from advancing.
e3b90b6ccc