Reverted changes for EUCA-8445.
Fixes for: EUCA-9727