This reverts commit 16a62d4f3dca189b0e0565c7ebcd83ddfcc67629. Needs some update to check lines to fix bb failure.