Should we revert this back?