Revert "Fixed data form description mapping"

This reverts commit c3434511cb077e5975c4d204cfd2345c52c1ac01.