Revert 895b793dc3048e98303b367f923c3ed779f0b129
Unfortunately this brakes table management.