Rolled back before rdata
Revert "Rolled back before rdata"

This reverts commit 22b7561ab1b6addb0f04672cbb1b99937d80c466.