Logically replaced by the simpler flow below.