This reverts commit 13839ac94a. Refs: #4973 Change-Id: If03e8f22ff4c8c65b20b486302fda0ffc8192662
13839ac94a