Revert "Fix for FLEX-34323."

This reverts commit 8d030e70396d3f57ce5f5bf4aa2255f093982604.