Remove workaround as it doesn't work.