Revert "TRUNK-3850"

This reverts commit 956e3f526fdf165f60c89ea18239dbd00df49915.