Revert "Resolved issue N_SE-38574"