Stop using the gj mappings...