Revert "Do less on the main thread"

This reverts commit e1713e606c91a12646180b05e86ecd09ac307af2.

Reason for revert: b/294185369
Fixes: 294185369

Change-Id: Iaeef3423e67da3ee3a5a86e231e2bfb6fef759bd
6 files changed