Proposed fix for Pivotal Bug 84990272