#109514: Changes so it will work in vainilla Sicecat.