Revert 3097c70..eed553a

This rolls back to commit 3097c707482f1228c0d89b25cccf713bd336ddc0.