reverted changes related to ob_start since there were pulled on a diff
branch.