Remove unneeded workaround, update CHANGELOG