Merge "Revert "Remove the no-longer-needed F/I and D/J alias.""