Reapplying changes made in commit
1b8a6ce56d05e9f8b7fc6c95ca58ab03fe164b8b

MESS started crashing immediately after I committed
1b8a6ce56d05e9f8b7fc6c95ca58ab03fe164b8b so I rolled that commit back,
but it turns out the crash was completely unrelated to the commit.
Recommitting changes now.