Remove outdated temporary workarounds.