Revert "Got working on .90, bug fixes"

This reverts commit 17a06be082a59379aa1562c5adaa492ebd662d8d.