Reverting WIP work that made it into the release.
Reverting WIP work that made it into the release.

FIxes #410

goshow-jp/Kraken,oculusstorystudio/kraken,goshow-jp/Kraken,oculusstorystudio/kraken,goshow-jp/Kraken