Revert 79c9622..77c25df

This rolls back to commit 79c9622e83c4eff426456733b9506912eafbb37a.