The issue should be fixed in a694a9f0. Thus, we can revert this workaround. This reverts commit db9a69e6. Change-Id: I30749295432e6cce0b324e1b0c9fc32e32eb79b0