Revert "Now that weve found the needle, heres the hay!"

This reverts commit 049e0c04199315d6378bdc6189a1e99e74c6f2dc.
Let's see what's the problem

Change-Id: I6c084001af81f1e2acfdf26e5c9a4df51b04ec3a