Revert 602591b..22b7ce9

This rolls back to commit 602591b137fe13b28e57c4dd776896f54563cb5b.