Bug 17459: Follow up