Fixing RTBT Methods that were two step

And by fixing I really mean hack into working -- really the underlying
JS should be fixed but I have no clue how to do that. Attempting was
like staring into the pit of hell.

Change-Id: I4a49f191a575eb510aef76ec4b08fcdd906c27e0
Merge "Fixing RTBT Methods that were two step"