Revert 83d8a2b..1b2d12b

This rolls back to commit 83d8a2b5f65632bf19ce08d245d41dd9b7e4d8e4.
No -- I'm already at the complexity limit.