This reverts commit 43341cd3e3, reversing changes made to ffb4befdd8. This is causing segfault in Geary.JS.to_string_released() when running client tests, so reverting until a solution is found.
43341cd3e3
ffb4befdd8