Revert "ACT-2083"

This reverts commit bc5917d3a94b6963b2cfc27378b6a49df38900ff.