Revert f2c1e10..22a72a0

This rolls back to commit f2c1e1058f2fe9e5471557a38b04c5b0326e41f9.