Remove this hack again