Why is this disabled? If we don't need it then we should just get rid of the code altogether.