(bug) revert JOIN/LOCK simplification