The actual fix

Change-Id: I142537ad8197de03325546cee4501b7cf93a8b06
Signed-off-by: Evan Anderson <evan1124@gmail.com>