Revert "Adapted to mapper simplification."

This reverts commit fcf10e4f129e048216636117ad1f84d6e5fe9f1e.