fwr: revert changes