Revert "fix for STRATOS-851"

This reverts commit 8cbf8a922ed4fcab8b72253097eced07eed65388.