Remove this stupid "hack"