Undoing #588 changes