Do you still need the code under "FIXME: Temporary fix, need to think of long term solution" ?