We should comment that this is a short-term hack :)