This needs to be debugged and understood, not just randomly "fixed"

This reverts commit 72827968e606adcdf8c16e5381b887180975ae46.

Change-Id: Ie79bb1d57d05c0a1e51733bacc1b103f44ddc153