Revert 2680ff1..0ea12c8

This rolls back to commit 2680ff10f02cc3ad9786b7f82fe23b5b8a3439ba.