Removed a horrendous code smell. The system object has been reverted to its behavior prior to commit 3a7f56487c.
Updating nightly build.