2ebdcbc3b0
Revert because new feedback and requested survey of master usage figuring table state. This reverts commit 52176184df595cf591e7c13fe18d959b2ba039a8.