diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 2cf9cff17..03a2721d8 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -269,11 +269,6 @@ void AssDialogue::UpdateText(boost::ptr_vector<AssDialogueBlock>& blocks) {
 	Text = join(blocks | transformed(get_text), "");
 }
 
-std::string AssDialogue::GetMarginString(int which) const {
-	if (which < 0 || which > 2) throw InvalidMarginIdError();
-	return std::to_string(Margin[which]);
-}
-
 bool AssDialogue::CollidesWith(const AssDialogue *target) const {
 	if (!target) return false;
 	return ((Start < target->Start) ? (target->Start < End) : (Start < target->End));
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index 24fd11b38..0fb287a7f 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -169,9 +169,6 @@ public:
 	void UpdateText(boost::ptr_vector<AssDialogueBlock>& blocks);
 	const std::string GetEntryData() const override;
 
-	/// @brief Get a margin
-	/// @param which 0 = left, 1 = right, 2 = vertical
-	std::string GetMarginString(int which) const;
 	/// Get the line as SSA rather than ASS
 	std::string GetSSAText() const override;
 	/// Does this line collide with the passed line?
@@ -184,9 +181,3 @@ public:
 	AssDialogue(std::string const& data);
 	~AssDialogue();
 };
-
-class InvalidMarginIdError : public agi::InternalError {
-public:
-	InvalidMarginIdError() : InternalError("Invalid margin id", 0) { }
-	const char *GetName() const { return "internal_error/invalid_margin_id"; }
-};
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index ff3718dd0..2bbafb5f8 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -597,9 +597,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx
 	if (paint_columns[4]) strings[4] = to_wx(line->Style);
 	if (paint_columns[5]) strings[5] = to_wx(line->Actor);
 	if (paint_columns[6]) strings[6] = to_wx(line->Effect);
-	if (paint_columns[7]) strings[7] = to_wx(line->GetMarginString(0));
-	if (paint_columns[8]) strings[8] = to_wx(line->GetMarginString(1));
-	if (paint_columns[9]) strings[9] = to_wx(line->GetMarginString(2));
+	if (paint_columns[7]) strings[7] = std::to_wstring(line->Margin[0]);
+	if (paint_columns[8]) strings[8] = std::to_wstring(line->Margin[1]);
+	if (paint_columns[9]) strings[9] = std::to_wstring(line->Margin[2]);
 
 	if (paint_columns[10]) {
 		strings[10].clear();
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 9bff32489..c38b6519a 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -328,7 +328,7 @@ void SubsEditBox::OnCommit(int type) {
 	if (type & AssFile::COMMIT_DIAG_META) {
 		layer->SetValue(line->Layer);
 		for (size_t i = 0; i < margin.size(); ++i)
-			change_value(margin[i], to_wx(line->GetMarginString(i)));
+			change_value(margin[i], std::to_wstring(line->Margin[i]));
 		comment_box->SetValue(line->Comment);
 		style_box->Select(style_box->FindString(to_wx(line->Style)));