This reverts commit c74dd640. Reverting to address coding standard issues raised in post-commit review.