Let's see what the problem is 2

Change-Id: Id8f64007c5d2fc0982c49c77f8422acec0126448
Revert "Revert "Now that weve found the needle, heres the hay!""

This reverts commit f2c2c9c7ff936fddcc7bf8685ce52d2481d56c95.