Revert "Factorisation of registration to extensible tables"

This reverts commit 5a0cff96523fb92731f37d987904afa53a8347c1.