Rollback update to joda-time