Revert "SFD-38"

This reverts commit 61946b033d59e2358bd628c28976d2849846d887.