We can remove this hack, at least.