Shortened rainbowbeam

fixes #1511

I think this one is up for debate but I figured it's easier to make a decision if you can test both ways, so I present option #2.