Bug 1033617

Request for review of solution for Bug 1033617.