Remove an outdated hack.

This is still a waste of your main thread, though.

Change-Id: Ic904619b2e1065b2bab577070a73f8175c1a48f3