Merge "Revert "Remove the rename() interceptor""