WICKET-1391: anyone got any better ideas?

[Igor Vaynberg]

ive just attached a draft patch to WICKET-1391. its kinda hacky, so i
want to see if anyone can come up with a more elegant way to do this.

-igor