2-bit correlation rollback

This rolls back to commit 6f612f66c5fe30a708be1408ced9ab670f184ab9.