Partially reverting recent change which broken a lot of examples