Necessary changes made per https://github.com/discourse/discourse/commit/b52143feff8c32f21ed53033b6a0a65ee45dce0e