Ditching the $opt parameter.

It's causing see-sawing problems on different instances, and we
never use it anyway.
So, forget you.

Change-Id: Id4b2ef0e2c72d5dabf7eebb2ac9f25f87722aba9