Reverted back to the original CoordFree specification