Bug 946866 - [DSDS] Temporary workaround for bug 977915.