Remove ugly hack. Still need good name.