reverting recent changes because friday