Revert "N2 buildup fix attempt. Putting this into separate commit in case it's not wanted."

This reverts commit e8a7b58affde1dd75e8923802559e18f0e8e454b.