Revert "Sink with the updated user table"

This reverts commit 57a6dfd354b79214b4ec4663677262d665ac96ed.