Revert to lesser evil solution right now.