Revert^2 "Modernize alternate bouncer logic"

b738edddb7fb410e0b60856e5f00d156d09d1913

Change-Id: I1d5f8d1331256c7d3d8c427993d2509a591b7e24
39 files changed