Leaving it this way for now to remain compatible with < 1.4.