Revert to working behavior