Return functional random maps
Revert "Return functional random maps"

This reverts commit 969ee1558a4c26404e94ebea1c00912dce39055f.