This reverts commit d20281ad.

Reason: This needs more investigation. Will apply when this is verified.