Revert "rapoport"

This reverts commit 58816d15d6d2fb4d5ddb4ba572507043c269f877.