Merge "Remove workaround for a fixed bug."