Revert ea07ac2..e26c04e

This rolls back to commit ea07ac2ae22204673596d6307d796b63071dda0d.