Revert "My derp AGAIN"

This reverts commit f1841bdabd98ad74c406c0f132cfef9ce7ced59b.

Change-Id: I18d849634a875b6587d44fc4f471d7ea4f188351