Revert "may be exploitable in current form - awaiting review" This reverts commit 7bff60edac.
7bff60edac