Revert ab7b3f3..f7c0c89

This rolls back to commit ab7b3f37b807c15f65df8ee6396f3dd034fa4a7a.
edit_date