Revert 2dae6e0..2950e59

This rolls back to commit 2dae6e04a1e4adb233a983dbb48fd0b7f64ce450.
Revert "Revert 2dae6e0..2950e59"

This reverts commit a8bc5e7dcf69ef292bd83ab3ff912c34f7e62038.
scroll after 20 no-wait