Partially reverting recent changes