Restoring other things I broke in this merge:
https://github.com/bigtreecms/BigTree-CMS/commit/220b2c65cbf6753ad7fe75708010263ce1d959d9#diff-097a20a11a711bc083dbc7cbcc16972bR183