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