Partial revert as this change was accidental.