Remove workarounds after bug fixes