Revert "FTE-318"

This reverts commit 1e95280b571fb5cebd07c7222b7dbb7cc95c0dde.