1.0.16.12: revert ADJOIN change from 1.0.16.5