Revert "TROIA-404"

This reverts commit f6feda81bb4b49fedb52b2cdd94288e8782f9adf.