Backed out a hacky fix that is no longer needed.