Revert back RAF-friendly input wrappers.