Revert "more fix"

This reverts commit 1418fdfd393dcab67934cba8f5b0346a9137d277.
Revert "more fixes"

This reverts commit 6ec2829e3533a83a69258542e0b364667272dd8b.
Revert "more look up tables"

This reverts commit a81e28f28fc867c4a5bc0e0d2321bf6dfb77a637.