Merge "Revert^2 "Modernize alternate bouncer logic""