Remove ugly hack again